improve error reporting

diff --git a/ChangeLog b/ChangeLog
index f8e2630a948eb01ef68587a9cea0590a43d3ddb2..65f8c083a5a0a9d7f1e2edf43a84d8eb107f3074 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-09  Øyvind Kolås  <pippin@gimp.org>
+
+       * babl/babl-internal.h: issue a babl_log when the named object is not
+       found durin string based lookup.
+       * babl/babl-pixel-format.c: added BABL_IMAGE to var_args switch.
+       * babl/babl-classes.c: set babl_hmpf_on_name_lookups initial value to
+       0, to make it hmpf only in babl-base.
+
 2005-08-09  Øyvind Kolås  <pippin@gimp.org>
 
        * babl/Makefile-mini: added babl-image.o.

diff --git a/babl/babl-classes.c b/babl/babl-classes.c
index 6303c9fbcf48290c6205fe99101b73775a7a80f1..f39350a5609800dcbb0e1bb48c989eeacf47d304 100644 (file)
--- a/babl/babl-classes.c
+++ b/babl/babl-classes.c
@@ -43,5 +43,5 @@ babl_class_name (BablClassType klass)
   return class_names[klass-BABL_INSTANCE];
 }
 
-int babl_hmpf_on_name_lookups = 1;
+int babl_hmpf_on_name_lookups = 0;
 

diff --git a/babl/babl-format.c b/babl/babl-format.c
index 3f9c2543fb4c78a49fd5953e2882e002333436a3..226125cecba6e00da60a78bf1a900dac3befee94 100644 (file)
--- a/babl/babl-format.c
+++ b/babl/babl-format.c
@@ -146,6 +146,7 @@ babl_pixel_format_new (const char *name,
               case BABL_CONVERSION_PIXEL_FORMAT:
               case BABL_CONVERSION_PIXEL_FORMAT_PLANAR:
               case BABL_FISH:
+              case BABL_IMAGE:
                 babl_log ("%s(): %s unexpected",
                           __FUNCTION__, babl_class_name (babl->instance.type));
                 break;

diff --git a/babl/babl-internal.c b/babl/babl-internal.c
index 6303c9fbcf48290c6205fe99101b73775a7a80f1..f39350a5609800dcbb0e1bb48c989eeacf47d304 100644 (file)
--- a/babl/babl-internal.c
+++ b/babl/babl-internal.c
@@ -43,5 +43,5 @@ babl_class_name (BablClassType klass)
   return class_names[klass-BABL_INSTANCE];
 }
 
-int babl_hmpf_on_name_lookups = 1;
+int babl_hmpf_on_name_lookups = 0;
 

diff --git a/babl/babl-internal.h b/babl/babl-internal.h
index fffa022528fa1c59b1baa1f563c4833e102789db..ea85b82a5600e5d1b97196a146882d7c3ab8483f 100644 (file)
--- a/babl/babl-internal.h
+++ b/babl/babl-internal.h
@@ -57,11 +57,19 @@ type_name##_id (int id)                                       \
 TypeName *                                                    \
 type_name (const char *name)                                  \
 {                                                             \
+  TypeName *ret;                                              \
+                                                              \
   if (babl_hmpf_on_name_lookups)                              \
     {                                                         \
       babl_log ("%s(\"%s\"): hmpf!", __FUNCTION__, name);     \
     }                                                         \
-  return (TypeName*) db_exist (0, name);                      \
+  ret = (TypeName*) db_exist (0, name);                       \
+                                                              \
+  if (!ret)                                                   \
+    {                                                         \
+      babl_log ("%s(\"%s\"): not found", __FUNCTION__, name); \
+    }                                                         \
+  return ret;                                                 \
 }
 
 #define BABL_DEFINE_INIT(type_name)                           \

diff --git a/babl/babl-pixel-format.c b/babl/babl-pixel-format.c
index 3f9c2543fb4c78a49fd5953e2882e002333436a3..226125cecba6e00da60a78bf1a900dac3befee94 100644 (file)
--- a/babl/babl-pixel-format.c
+++ b/babl/babl-pixel-format.c
@@ -146,6 +146,7 @@ babl_pixel_format_new (const char *name,
               case BABL_CONVERSION_PIXEL_FORMAT:
               case BABL_CONVERSION_PIXEL_FORMAT_PLANAR:
               case BABL_FISH:
+              case BABL_IMAGE:
                 babl_log ("%s(): %s unexpected",
                           __FUNCTION__, babl_class_name (babl->instance.type));
                 break;